Revision: bazaar--devel--1.1--patch-29
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu Dec  9 01:59:04 EST 2004
Standard-date: 2004-12-08 14:59:04 GMT
New-files: commands/.arch-ids/cmd-resolved.c.id
    commands/.arch-ids/cmd-resolved.h.id
    commands/cmd-resolved.c commands/cmd-resolved.h
Renamed-files: commands/lint.c commands/cmd-problems.c
    commands/lint.h commands/cmd-problems.h
Modified-files: commands/cmd-apply-delta.c
    commands/cmd-commit.c commands/cmd-problems.c
    commands/cmd-problems.h commands/cmd-replay.c
    commands/cmd-update.c commands/cmds.c
    libarch/apply-changeset.c libarch/proj-tree-lint.c
    libarch/proj-tree-lint.h
New-patches: jblack@gnuarch.org--2004/baz--problems--1.1--base-0
    jblack@gnuarch.org--2004/baz--problems--1.1--patch-1
    jblack@gnuarch.org--2004/baz--problems--1.1--patch-2
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-29
    thelove@canonical.com/bazaar--devo--1.1--patch-35
    thelove@canonical.com/bazaar--devo--1.1--patch-36
    thelove@canonical.com/bazaar--devo--1.1--patch-37
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--problems--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-30

 * jblack@gnuarch.org--2004/baz--problems--1.1--patch-1
   First working stab at problems command

 * jblack@gnuarch.org--2004/baz--problems--1.1--patch-2
   For some silly reason my boss decided to work on the same code he assigned me to work on

 * thelove@canonical.com/bazaar--devo--1.1--patch-35
   clean up merge 3 way temp dir after use

 * thelove@canonical.com/bazaar--devo--1.1--patch-36
   clean up merge 3 way temp dir after use

 * thelove@canonical.com/bazaar--devo--1.1--patch-37
   baz now has conflict tracking (of a sort)

